chore(ui): Guard `ConfigureSSO` based on active organization by LauraBeatris · Pull Request #8613 · clerk/javascript

LauraBeatris · 2026-05-21T16:50:07Z

Description

Resolves ORGS-1595

Do not allow <ConfigureSSO /> to be used if organizations are disabled or if the current organization session isn't active.

Checklist

pnpm test runs as expected.
pnpm build runs as expected.
(If applicable) JSDoc comments have been added or updated for any package exports
(If applicable) Documentation has been updated

Type of change

changeset-bot · 2026-05-21T16:50:12Z

🦋 Changeset detected

Latest commit: f4487f5

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 20 packages

Name	Type
@clerk/clerk-js	Patch
@clerk/shared	Patch
@clerk/chrome-extension	Patch
@clerk/expo	Patch
@clerk/astro	Patch
@clerk/backend	Patch
@clerk/expo-passkeys	Patch
@clerk/express	Patch
@clerk/fastify	Patch
@clerk/hono	Patch
@clerk/localizations	Patch
@clerk/msw	Patch
@clerk/nextjs	Patch
@clerk/nuxt	Patch
@clerk/react-router	Patch
@clerk/react	Patch
@clerk/tanstack-react-start	Patch
@clerk/testing	Patch
@clerk/ui	Patch
@clerk/vue	Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

vercel · 2026-05-21T16:50:13Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated (UTC)
clerk-js-sandbox	Ready	Preview, Comment	May 25, 2026 9:47pm

pkg-pr-new · 2026-05-25T21:29:51Z

Open in StackBlitz

@clerk/astro

npm i https://pkg.pr.new/@clerk/astro@8613

@clerk/backend

npm i https://pkg.pr.new/@clerk/backend@8613

@clerk/chrome-extension

npm i https://pkg.pr.new/@clerk/chrome-extension@8613

@clerk/clerk-js

npm i https://pkg.pr.new/@clerk/clerk-js@8613

@clerk/dev-cli

npm i https://pkg.pr.new/@clerk/dev-cli@8613

@clerk/expo

npm i https://pkg.pr.new/@clerk/expo@8613

@clerk/expo-passkeys

npm i https://pkg.pr.new/@clerk/expo-passkeys@8613

@clerk/express

npm i https://pkg.pr.new/@clerk/express@8613

@clerk/fastify

npm i https://pkg.pr.new/@clerk/fastify@8613

@clerk/hono

npm i https://pkg.pr.new/@clerk/hono@8613

@clerk/localizations

npm i https://pkg.pr.new/@clerk/localizations@8613

@clerk/nextjs

npm i https://pkg.pr.new/@clerk/nextjs@8613

@clerk/nuxt

npm i https://pkg.pr.new/@clerk/nuxt@8613

@clerk/react

npm i https://pkg.pr.new/@clerk/react@8613

@clerk/react-router

npm i https://pkg.pr.new/@clerk/react-router@8613

@clerk/shared

npm i https://pkg.pr.new/@clerk/shared@8613

@clerk/tanstack-react-start

npm i https://pkg.pr.new/@clerk/tanstack-react-start@8613

@clerk/testing

npm i https://pkg.pr.new/@clerk/testing@8613

@clerk/ui

npm i https://pkg.pr.new/@clerk/ui@8613

@clerk/upgrade

npm i https://pkg.pr.new/@clerk/upgrade@8613

@clerk/vue

npm i https://pkg.pr.new/@clerk/vue@8613

commit: f4487f5

coderabbitai · 2026-05-25T21:34:27Z

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

Configuration used: Repository YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro

Run ID: 4e0e72f6-0da9-4668-badb-3754699f4cd7

📥 Commits

Reviewing files that changed from the base of the PR and between 64c9d22 and f4487f5.

📒 Files selected for processing (2)

packages/clerk-js/src/core/clerk.ts
packages/shared/src/internal/clerk-js/warnings.ts

📝 Walkthrough

Walkthrough

This PR gates ConfigureSSO behind the organizations environment setting by adding 'ConfigureSSO' as a caller for the enable flow, updating disabledSelfServeSSOFeature to check clerk.organization?.selfServeSSOEnabled, extending organization-related warnings to include ConfigureSSO, and modifying mountConfigureSSO to attempt enabling organizations, short-circuit when disabled, enforce a dev-time "user exists but no org" guard, and run existing feature checks afterwards.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

clerk/javascript#8600: Surfaces self-serve SSO configuration in OrganizationProfile and uses the updated disabledSelfServeSSOFeature guard to compute route visibility for ConfigureSSO.

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title accurately and concisely describes the main change: guarding ConfigureSSO based on active organization status.
Description check	✅ Passed	The description is directly related to the changeset, explaining the purpose of the changes and providing visual documentation of the error behavior.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

LauraBeatris self-assigned this May 21, 2026

github-actions Bot added the clerk-js label May 21, 2026

vercel Bot deployed to Preview May 21, 2026 17:22 View deployment

LauraBeatris requested a review from a team May 21, 2026 17:24

LauraBeatris marked this pull request as ready for review May 21, 2026 17:24

vercel Bot deployed to Preview May 21, 2026 17:24 View deployment

LauraBeatris force-pushed the laura/update-configuresso-to-work-with-orgs-only branch from 3b44ae7 to 75c901d Compare May 21, 2026 17:24

vercel Bot deployed to Preview May 21, 2026 17:25 View deployment

LauraBeatris force-pushed the laura/add-self-serve-sso-org-profile branch 5 times, most recently from 6f5a23a to d951d19 Compare May 21, 2026 17:44

iagodahlem approved these changes May 21, 2026

View reviewed changes

LauraBeatris force-pushed the laura/add-self-serve-sso-org-profile branch 2 times, most recently from 36ae016 to 6e345b0 Compare May 25, 2026 21:14

Base automatically changed from laura/add-self-serve-sso-org-profile to main May 25, 2026 21:22

LauraBeatris added 3 commits May 25, 2026 18:26

Add active organization guard for ConfigureSSO

141acd7

Integrate with orgs in-app prompt

55dba5f

Add changeset

64c9d22

LauraBeatris force-pushed the laura/update-configuresso-to-work-with-orgs-only branch from 75c901d to 64c9d22 Compare May 25, 2026 21:26

vercel Bot deployed to Preview May 25, 2026 21:27 View deployment

Add createCannotRenderComponentWhenOrgDoesNotExist

f4487f5

vercel Bot deployed to Preview May 25, 2026 21:47 View deployment

LauraBeatris merged commit 4d5027b into main May 25, 2026
45 checks passed

LauraBeatris deleted the laura/update-configuresso-to-work-with-orgs-only branch May 25, 2026 22:00

clerk-cookie mentioned this pull request May 25, 2026

ci(repo): Version packages #8635

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(ui): Guard `ConfigureSSO` based on active organization#8613

chore(ui): Guard `ConfigureSSO` based on active organization#8613
LauraBeatris merged 4 commits into
mainfrom
laura/update-configuresso-to-work-with-orgs-only

LauraBeatris commented May 21, 2026 •

edited

Loading

Uh oh!

changeset-bot Bot commented May 21, 2026 •

edited

Loading

Uh oh!

vercel Bot commented May 21, 2026 •

edited

Loading

Uh oh!

pkg-pr-new Bot commented May 25, 2026 •

edited

Loading

Uh oh!

coderabbitai Bot commented May 25, 2026 •

edited

Loading

Walkthrough

Estimated code review effort

Possibly related PRs

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

LauraBeatris commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Checklist

Type of change

Uh oh!

changeset-bot Bot commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🦋 Changeset detected

Uh oh!

vercel Bot commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pkg-pr-new Bot commented May 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai Bot commented May 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Walkthrough

Estimated code review effort

Possibly related PRs

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

LauraBeatris commented May 21, 2026 •

edited

Loading

changeset-bot Bot commented May 21, 2026 •

edited

Loading

vercel Bot commented May 21, 2026 •

edited

Loading

pkg-pr-new Bot commented May 25, 2026 •

edited

Loading

coderabbitai Bot commented May 25, 2026 •

edited

Loading